[Backport to 2.x] Manual backport of several dependabot PRs #5330
+30
−25
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.